8f437ade5e2fd07aeb51b071528e08fc29c1a205,src/scaffolding/org/codehaus/groovy/grails/scaffolding/ViewDelegatingScaffoldResponseHandler.java,ViewDelegatingScaffoldResponseHandler,handleResponse,#HttpServletRequest#HttpServletResponse#String#Map#,35

Before Change


		
		
		return new ModelAndView(
				scaffoldViewResolver.resolveViewForUriAndAction(request.getRequestURI(), actionName), 
					model );
	}

After Change


			throw new IllegalStateException("Property [viewResolver] is required to be set, but is null");
		
		
        Object includeUri = request.getAttribute("javax.servlet.include.request_uri");
        String uri;
        if (includeUri != null) {
        	uri = (String) includeUri;
        } else {
        	uri = request.getRequestURI();
        }
		return new ModelAndView(
				scaffoldViewResolver.resolveViewForUriAndAction(uri, actionName),